(vc-bzr-after-dir-status): Ignore pending merges.
authorDan Nicolaescu <dann@ics.uci.edu>
Wed, 6 Jan 2010 15:11:52 +0000 (07:11 -0800)
committerDan Nicolaescu <dann@ics.uci.edu>
Wed, 6 Jan 2010 15:11:52 +0000 (07:11 -0800)
commita89fd4d924fd507c1697222dfbc5c512d683c6c3
tree47d87fcc9cd7dfcfb2b94907e6e5914999fe1bd2
parent438d470ff7897fc60748be82fe06bffe12eb617f
(vc-bzr-after-dir-status): Ignore pending merges.
lisp/ChangeLog
lisp/vc-bzr.el